Fix out-of-bound access. (#440918, Matthias Kilian)

2007-06-12  Behdad Esfahbod  <behdad@gnome.org>

        * io-pnm.c (explode_bitmap_into_buf): Fix out-of-bound access.
        (#440918, Matthias Kilian)

svn path=/trunk/; revision=18110

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 6bb659fc8cf7943f5b20251292ab6dd79204f7c4..730a53379df4effdeb6ab14a1edf94a313890966 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-12  Behdad Esfahbod  <behdad@gnome.org>
+
+       * io-pnm.c (explode_bitmap_into_buf): Fix out-of-bound access.
+       (#440918, Matthias Kilian)
+
 2007-06-06  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.11.2 ===

diff --git a/gdk-pixbuf/io-pnm.c b/gdk-pixbuf/io-pnm.c
index f9391ca0b4d114456ea9cf910f96080e07f10657..37f726b30c086c80353914118f34afd4de333da0 100644 (file)
--- a/gdk-pixbuf/io-pnm.c
+++ b/gdk-pixbuf/io-pnm.c
@@ -133,7 +133,7 @@ explode_bitmap_into_buf (PnmLoaderContext *context)
                to -= 3;
                bit++;
                
-               if (bit > 7) {
+               if (bit > 7 && x > 0) {
                        from--;
                        data = from[0];
                        bit = 0;